]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Install keybindings relative to our datadír
authorJan Tojnar <jtojnar@gmail.com>
Thu, 9 Apr 2020 20:25:32 +0000 (22:25 +0200)
committerFlorian Müllner <florian.muellner@gmail.com>
Mon, 13 Apr 2020 15:27:09 +0000 (15:27 +0000)
It is a good practice to install files relative to our own variables

https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/

and it is required on systems like NixOS.

---

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194

meson.build

index 052a2d72b21268719229bcc87601342f448a044d..b5a4d1c00045c7c8563c7333deab99adcedafcbc 100644 (file)
@@ -72,7 +72,7 @@ systemduserunitdir = join_paths(prefix, 'lib', 'systemd', 'user')
 
 keybindings_dep = dependency('gnome-keybindings', required: false)
 if keybindings_dep.found()
-  keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
+  keysdir = keybindings_dep.get_pkgconfig_variable('keysdir', define_variable: ['datadir', datadir])
 else
   keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
 endif